Auto merge of #2590 - alexcrichton:dont-warn-about-flags-and-configs, r=brson
authorbors <bors@rust-lang.org>
Tue, 19 Apr 2016 18:46:40 +0000 (11:46 -0700)
committerbors <bors@rust-lang.org>
Tue, 19 Apr 2016 18:46:40 +0000 (11:46 -0700)
commit8975f30d80f0d1c52369609d84ff2a79bd87649b
tree62f15c9ae074bd58979f4ff6893e47f557bd4bed
parentb6b6d0b212c2efe69d09129f9031318f1ecdf8da
parentb40e1db7dfa7ab431485fb5b4c70183e43152cbc
Auto merge of #2590 - alexcrichton:dont-warn-about-flags-and-configs, r=brson

Have CLI take preference over config for verbosity

If a CLI option is passed, that trumps any command line configuration, otherwise
just do what we did previously.

Closes #2588